Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Partially revert eee9362a7 #14502

Merged
merged 1 commit into from
Feb 21, 2023
Merged

Partially revert eee9362a7 #14502

merged 1 commit into from
Feb 21, 2023

Conversation

gamanakis
Copy link
Contributor

@gamanakis gamanakis commented Feb 17, 2023 •
edited
Loading

Motivation and Context

See commits 34ce4c4, eee9362.

Description

With commit 34ce4c4 applied, there is no need for eee9362. Revert that aside from the test.
All tests introduced in those commits pass.

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@gamanakis gamanakis changed the title Revert partially eee9362a7 Partially revert eee9362a7 Feb 17, 2023
@gamanakis gamanakis marked this pull request as ready for review February 17, 2023 18:15
behlendorf
behlendorf approved these changes Feb 17, 2023
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for following up with this!

@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Feb 17, 2023
@gamanakis
Copy link
Contributor Author

gamanakis commented Feb 18, 2023 •
edited
Loading

@tonyhutter For the upcoming 2.1.10: I think it would be best to include commit 34ce4c4 and this one, on top of 2.1.9 which already includes eee9362.

This was referenced Feb 18, 2023
Closed
Merged
@gamanakis
Partially revert eee9362
1123601 
With commit 34ce4c4 applied, there is no need for eee9362.
Revert that aside from the test. All tests introduced in those commits
pass.

Signed-off-by: George Amanakis <[email protected]>
@gamanakis
Copy link
Contributor Author

1123601: Remove a code block in dsl_scan.c that was accidentally duplicated in 34ce4c4.

@behlendorf behlendorf merged commit 0f32b1f into openzfs:master Feb 21, 2023
gamanakis added a commit to gamanakis/zfs that referenced this pull request Feb 27, 2023
@gamanakis
Partially revert eee9362
d0cb5ef 
With commit 34ce4c4 applied, there is no need for eee9362.
Revert that aside from the test. All tests introduced in those commits
pass.

Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: George Amanakis <[email protected]>
Closes openzfs#14502
behlendorf pushed a commit that referenced this pull request Mar 1, 2023
@gamanakis @behlendorf
Partially revert eee9362
0832395 
With commit 34ce4c4 applied, there is no need for eee9362.
Revert that aside from the test. All tests introduced in those commits
pass.

Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: George Amanakis <[email protected]>
Closes #14502
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 3, 2023
@gamanakis @lundman
Partially revert eee9362
d5395a5 
With commit 34ce4c4 applied, there is no need for eee9362.
Revert that aside from the test. All tests introduced in those commits
pass.

Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: George Amanakis <[email protected]>
Closes openzfs#14502
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryao ryao ryao approved these changes

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gamanakis @behlendorf @ryao